projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd16531 ba77d5a)
bitkeeper revision 1.1236.1.172 (424bc942fd6538s_Er3ugXStTdd5Nw)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 31 Mar 2005 09:56:18 +0000 (09:56 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 31 Mar 2005 09:56:18 +0000 (09:56 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
xen/common/page_alloc.c patch | diff1 | diff2 | blob | history

diff --cc xen/common/page_alloc.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.